Some code improvements & PC