Additions And Fixes