Fixes and enhancements
Added all the tings