Fixing stuff, adding concepts.