Bug Fixes & General Clean up