Bug fixes and new stuff

- Fixed the makefile
- Beginning to implement config file