Cleaned up the Factory a little. Also, renamed some of the to{$type} commands to match the classes themselves.