More generation

Added other generation features, mainly not working