fixed some bugs, started annotation system.