weekend work, fixed some pc-version bugs