clean repo due too many bugs :(
big fix
multiple bugs fixed