total refactor of abstract, small title tweaks