fixing and adding some things etc.