Several more updates and fixes, thnx Jag :)