Freemarker is now complete. Also made minor cleaning.