further updates, almost finished