got it to actually build + a few more cleanups
3 files changed