Fixed a shit load of problems and added new options