Feature/last minute fixes