fixing bugs and adding decoration