Made further additions and fixes