Some bugs were sorted out