Just some simple improvements yet