Bug Fixes improved functionality