fixed more bugs, task4b complete