fixes and additional tasks