fixed some bugs
Almost done.

Some strange problems with font but its ok.