version bump and makefile fixes