added a bit of odds stuff