[WIP] lots of changes and todos left here..
minor changes