Fixed bugs and added displaying