Tons of fixes and enhancements - enjoy :)