updating to current version (minor degug changes and naming)