Small tweaks here and there. Non-working test draft.