fixed several things (can't remember)