Revert "My own personal improvements branch, not meant to be merged as of now."

This reverts commit 8d887b3c7b568b40dde13a80f0eea14bd2795e51.