added a few misc stuff