Made many various changes