bugs fixed

almost