removed some useless code
fixed some labels
merge with Monotone Source