Fixed bugs, improved naming...