changed names of some functions + variables and tried to fix #23

... but failed