finalizing some changes, cleaning some stuff up