refactor expression (now doesn't implement command), fixed javadocs and removed TODOs
"Safe" (my ass) command casting from expression