class structure is a little better
fixed extended commands