add some messages
Re-arrange libs