Add comments and misc libraries