Made more optimizations I didn't have time to implement originally