Changed namespace name and finished some leftover comments