refactors, fixes & fixes(?)