Misc cleanups

@fosdev Please review and merge!
added another spec