Some resources closing, merge fixing & bpm seting