Fixed some issues... no idea what exactly