Small improvements, lots of thinking, console implementation is on the way