bugs fixed, feels better, needs more work