Bug

bugs revised & demo units added