Finished generic support in solver and fixed generics in puzzle and clock