refactoring galament tasks. small fixes