little tidbits cleaned up