More things done and some bugs fixed.

Beta