pc changes and bug fixes