more clearn up and fixes