chumma change
minor bugs