Added assistance menu and solver + fixed some bugs