various improvements

proof of concept)(s)