Some progress and fixed readme