bugs are fixed :)