Speed vs. orientation optimizations, other fixes