Added HelperClass and small Bugfixes