add -favourite and cleanup some other stuff
comments
merge files
use the bool type