vikkio88 fixed some bugs and improved a bit the overall style