added a few stuff