Added new publication + some cleanups