Added defaults, cleaned code, fixed bugs

Added new defaults.
Cleaned some code.
Fixed little bugs.