K2 progress, code cleanup, simple UI added