ADDED: fixes to location and variable names