fixed several bugs, almost ready now