More bugs fixed v2.0