and bugs fixed!