update to 0.6, oop, cleanup, add char fixing, more