changed fps max
merged, commented, and added music