Usability optimisation, small bug fixes, sql file update