some simple improvements