fix other stupid things and add forgotten methods