fixes and modifications, final ?