fixed some spacing issues and attempted at #381