fixed crazy spinning bugs