building funcitonality for picchange + bugfixes