added condition commands + more work on elements