applied fix
various changes