Fixed some issues thanks to Soedar proofreading