some final (hahahahaha) changes