Updated comments and stuff