Few changes.

The start should work. Was to lazy and sleepy to rename things.