5th april task
fixed misc issues
Fixed payment issue