Bugs fixed. Done (except for reflection bug)