Feature/small updates