added some more changes
libs included