A little fix that solves the forwards, backwards searching problem and an overworked, cleaned up Makefile