- fixed handler functions.
- modified Makefile