Added makefile
Tidy, and changed rate-finding-mode to be more automatic