minor improvements
wtf