updating info and events, fixed makefile