finalized some spacing issues