Project complete 1.1.2

Major bugs sorted out