Feature nathan tweaks

rounding out some features, solving some problems, and just making overall progress