some gentic improvments