optimizations and extra aliases/global changes