get/set + fixes