Bug fixes
Almost Working