Normal generation now works, little things to add