A few changes, additions and fixes!