some more improvements. however i also want to mention how fucking ridiculous the last bug was! Fuck