more work towards layout, highly unfinished
fiy typos