Bug Fixes
Making everything tidy