Bug Fixes and additional options