Feature/ape improvements

Various improvements to the APESolver.

Note that this also changes the copyright statement of the files i contributed to. As i am not part of any of the organisations mentioned in the previous statement, i cant publish anything under their names. Therefore, i added myself to the copyright holders for the specific files. This is how most open source projects i have contributed to handle this. Please get in touch with me if you are not OK with that so we can figure something out.