Many updates and fixes, did not break backwards compatability after all!