some additional cleaning up. Can be done still a lot nicer, but it´s coming. But for now, I´m going to sit on my butt.