final commit all bugs fixed, i think