erorcun little renamings & librw update