Bug

small bugs revised & all platform has demo unit now