Bugs

Bugs and renamin variables