Moar usability (updates #100)