Minor fixes, this is stable. Next, clean code.