Minor adjustments. Still WIP.