17/11/2013 Major updates and fix a lot of buggy laggy code