Fix thingie + comment stuffs