Some stuff I ran into

I've not yet succeeded in getting it to build correctly, but figured I'd send in the simple stuff for now.