fixed naming and added patches