Adds a comp() method on F1

Also moves some predefs
Simplifies lib with then() methods