More bugs fixed v3.0