refactores, fixes & cleanup