Some Fixes ,Enhancements and shiz