cleanup and import x11 lib
update todo