adding make file, fixed loads of stuff