- fixed more stuff here and there