last small changes, final working project