Fired Make and fixed some errors