working on spacing issues mostly