make file ridefinidion
Various small tweaks from morfic and franco