minor fix + cleanings
tweaks
minor optimizations