Small fixes
Complete the covers