Add more metadata
Fix Jos layout fixes 8-D