Added commands + more work on spawners