short options and lot of fixes