a bit more english variable names
minor bugfixes