fixed several problems...