Debug & enhancements 2: #20, #21, #54, #56, #57 y #58