Yeah, these are both things I've been looking at and interested in reworking. I'll definitely do so before release.
