some spacing changes
merged stuff