fixing a bug
fixed issues renamed a few functions