Some fixes and additions. Not much though! :)