Fixed some stuff... still not good enough though!