Bug fixing + comments