Thanks for the feedback! I'll put these in as GitHub issues and try to work them out once I'm back from the gym :)