requirements
merged
fixing some issues