Fixed, finished... commenting needs attention