wip
wip 2
wip 3
fixed some errors