FIX: Fix readme and more optimization.