Revamp Scripts and small fix oak