More updates

+Forgot to mention. Some major naming changes to more understandable
form.
+Taken unneccessary stuff away.