extra tasks + fixes