more optimizations (now isn't the moment, but I don't care)