adding a few things from hammerfist