Additions and fixes