Some addition and fixes