Additions and Fixes