Updating for some minor bugs