Speed enhancements

Also sealed some holes
Also reduced file sizes