back again

More or less. Can't play right now. Mostly some copy&paste things. Can't
wait to see the errors this will cause :>