fixed weird spacing issues
fixed lots of issues