Done forwarding and fixed local command bugs