Performance

Working on some performance bugs