Small refactors, bug fixing.