Minor updates to functionallity, some bells and whistles added