minor changes
minor changes and rebasing
adjusted spacing a bit