Fixed some stuff, but there are problems..still