master: fixing small bugs n stuff