Fixed /f/ support and organized some code.