Fix lot of bugs, seems to work, a little.