bug fixes

Clean up and alignment issues sorted