cleanups and improvementes, yay