Minor changes
Fixed minor bugs