Big fixes (20/24)

Big fixes