Did some touch-ups to make it good for deployment