Made the make file more general, ready for serious testing and any extra options