Added some stuff. Fixed some stuff. No documentation... yet