fixed some things around runtime