Major improvements & bugfixes