Major fixes. going now, bye!