I should really test these changes before I commit them.... Also removed libpng dependency from Makefile