second commit, added basic comments plus general fixes