commits to wacky functions

silly bug ternary statement..etc