Cases fixed

fixed cases and more comments