Fixed some issues and stuffz