Bug/acm dsc 508

Fix various bugs.