functionality fixes