STufff

Some more updates to code and whatnot.