Optimized some things, updated some others