No longer requires space seperated entry.  Also fixed operations without parenthesis.