major update, now it looks really usable