Provided a fix for issue 60. Simplified f-commands. Cleaned up some code.