couple of bug fixes and corrections to Makefile
couple of bug fixes and corrections to Makefile

Liamraystanley/marill,lrstanley/marill,Liamraystanley/marill,lrstanley/marill,Liamraystanley/marill,lrstanley/marill