variable names
bug fixes from testing