Cleanup

Cleaned some stuff
changed all numbers to double
Some name changes
Small fix