preliminary makefile done
Added remaining tokens (for now), fixed a few issues