fixes here and there. finish stage one.