Fixed some various things