Small fixes
More written on requirements document