Fixes #19, fixes #20, fixes #21

I hope after this commit, that brix core has reaches a usable revision.
Can't wait to see the day #8 closes.