finished
bugs fixed
finished version