Final changes for version 0.9

Changed some stuff around, fixed some of the bugs that were present.