uploading some fixes