Fixed various issues, added support