More stuff... I made a few mistakes and lost track of the changes :(