max added a few useful things