Fixed bugs and added dummy stops