Small but mighty improvements
more small and mighty tweaks