changed constants to variables
updated changelog
cleanup