Corrected a few bugs
Tried some stuff