More additions and fixes