updated libraries and minor modifications