Resolved most of Sebastian's comments