Fixes and Additions