Small refactors and bug fixes - v0.2.5