performance tweaks
perf
unbreaking things and perf tweaks