Fix bug and general update