many incomplete changes
fix merge conflict
move default library to a separate file
better help
better help