more code!! + bug

bug spotted :( will come back again :@