Fixing most of the small bugs, before gong for a full design rework.