Merge branch "laptop" to master

[LeftistTachyon]

These are changes I made on my laptop and didn't upload. Now the branches should be merged to combine the bug fixes.

• [x] Find the changes
• [x] Determine which ones are bug fixes
• [x] Remove redundancy
• [x] Touch up the branches
• [x] Merge!