Additions and fix