objectives (wip), ajustes varios