Clean up some stuff and add port reflection