Fixes and improvements, NOT READY YET!
Fixes, improvements and bug fixes