Working on part2-1 and bus on SIGBTools

Fix the errors he sent by email for the SIGTools, kept original just
comment them out