fixes. refactors. etc