post code fixes, moved scripts