Updates / fixes

Made some important fixes