Some fucking fixes & update