some post fixes. todo: fix scripts