Feature/general fixes