fixes & beautifying