fixed a layout issue
fixed small bugs.
cleaned up a few intentions.
merged