Made small adjustments, final commit