Reshuffled some parts and worked through the TODO lists

• still missing the RL wholesale part, experimenting with the code right now
• everything else though... I don't find anything, need feedback from others