Removed singleton instance & added more lua bindings
* Some tidying up