Refactored Variable names
Change some small things,
Tested more things with the web GUI