Fixed minor bugs, plus new task solved