More misc changes, testing some new stuff