Bug Fixes and additions