Bug Fixes & Touch up work