removed some useless code
fixed some labels