minor changes

fixed bugs
cleaned workspace
replaced hardcoded strings with localized values