fix bugs, add Solutions