Bug Fixes, Additions

Bug Fixes and additions