Staal clean

hi, i've started to clean up and fix some issues

i'll use this pull request as a means to discuss the remaining issues

DO NOT MERGE ;)