Update changes

Made several changes.
Fixed bug#04