refactored some names

Signed-off-by: Nicholas Lum <nicholaslum444@hotmail.com>
slightly more updates and refactoring

also tested something on the random testing