second update, created some fixes