Updates and bug fixes 25/04/2014