Bug Fixes and added features