added a few various changes