changed make file, fixed exceptions