level fix and a few things