diff --git a/fbxa/bot_phys.qc b/fbxa/bot_phys.qc
index f2c3c2c..4d1366a 100644
--- a/fbxa/bot_phys.qc
+++ b/fbxa/bot_phys.qc
@@ -229,15 +229,15 @@ void(vector wishvel) SV_Accelerate =
 };
 void() SV_WaterMove =
 {
-        local vector wishvel;
-        local float wishspeed, addspeed, cspeed, newspeed;
+	local vector wishvel;
+	local float wishspeed, addspeed, cspeed, newspeed;
 	makevectors(self.v_angle);
 	wishvel = v_right * self.movevect_y + v_forward * self.movevect_x;
 	
 	if (self.movevect == '0 0 0')
-                wishvel_z = wishvel_z - 60;
+		wishvel_z = wishvel_z - 60;
 	else
-                wishvel_z = wishvel_z + self.movevect_z;
+		wishvel_z = wishvel_z + self.movevect_z;
 	wishspeed = vlen(wishvel);
 
 	if (wishspeed > sv_maxspeed) {
@@ -245,7 +245,7 @@ void() SV_WaterMove =
 		wishspeed = sv_maxspeed;
 	}
 	wishspeed = wishspeed * 0.7;
-        cspeed = vlen(self.velocity);
+	cspeed = vlen(self.velocity);
 	if (cspeed) {
 		newspeed = cspeed - (real_frametime * cspeed * sv_friction);
 		if (newspeed < 0)
@@ -258,13 +258,13 @@ void() SV_WaterMove =
 	if (!wishspeed)
 		return;
 	addspeed = wishspeed - newspeed;
-        if (addspeed <= 0)
+	if (addspeed <= 0)
 		return;
 	wishvel = normalize(wishvel);
-        cspeed = sv_accelerate * wishspeed * real_frametime;
-        if (cspeed > addspeed)
-                cspeed = addspeed;
-        self.velocity = self.velocity + cspeed * wishvel;
+	cspeed = sv_accelerate * wishspeed * real_frametime;
+	if (cspeed > addspeed)
+		cspeed = addspeed;
+	self.velocity = self.velocity + cspeed * wishvel;
 };
 void() SV_AirMove =
 {
diff --git a/fbxa/bot_qw.qc b/fbxa/bot_qw.qc
index b168c66..a37463d 100644
--- a/fbxa/bot_qw.qc
+++ b/fbxa/bot_qw.qc
@@ -129,7 +129,7 @@ entity [32] phys_objects;
 .float	wallhug, keys, oldkeys, ishuman;
 .float	b_frags, b_shirt, b_pants; 
 .integer b_clientno;
-.float	priority, ai_time, b_sound, missile_speed;
+.float	ai_time, b_sound, missile_speed;
 .float	portal_time, b_skill, switch_wallhug;
 .float	b_aiflags, b_num, b_chattime;
 .float	b_entertime; // QW shtuff
@@ -140,7 +140,7 @@ entity [32] phys_objects;
 .entity	target1, target2, target3, target4;
 .entity	_next, _last;
 .entity	current_way;
-.vector	b_angle, b_dest, mouse_emu, obs_dir;
+.vector	b_angle, mouse_emu, obs_dir;
 .vector	movevect, b_dir;
 .vector dyn_dest;
 .vector	punchangle; // HACK - Don't want to screw with bot_phys
diff --git a/fbxa/libfrikbot.h b/fbxa/libfrikbot.h
index 65e97b6..e0a16ad 100644
--- a/fbxa/libfrikbot.h
+++ b/fbxa/libfrikbot.h
@@ -2,6 +2,9 @@
 #define TRUE 1
 
 // ----- entity fields ---
+/* wallhug
+ *	bot	follow walls on left (false) or right (true)
+ */
 @extern .float	wallhug;
 /* keys
  *	wp	if true, waypoint isn't busy (?)
@@ -35,24 +38,45 @@
  *	bot	pants color
  */
 @extern .float	b_pants; 
-@extern .float	priority;
+/* ai_time
+ *	bot	ai thinking framerate control
+ */
 @extern .float	ai_time;
 /* b_sound
  *	wp	if this waypoint is on a bot's route, the bit corresponding to the bot
  *		client number will be set
- *	bot	end time of current playing soud (for bots hearing enemies)
+ *	bot	end time of current playing sound (for bots hearing enemies)
  */
 @extern .float	b_sound;
+/* missile_speed
+ *	?	?
+ */
 @extern .float	missile_speed;
+/* portal_time
+ *	?	dynamic waypoints?
+ */
 @extern .float	portal_time;
 /* b_skill
  *	wp	target2 waypoint number
  *	bot	skill level: 0 = easy, 3 = nightmare
  */
 @extern .float	b_skill;
+/* switch_wallhug
+ *	bot	client linking stuff (bad name!!)
+ */
 @extern .float	switch_wallhug;
+/* b_aiflags
+ *	wp
+ *	bot
+ */
 @extern .float	b_aiflags;
+/* b_num
+ *	bot	bot number
+ */
 @extern .float	b_num;
+/* b_chattime
+ *	bot	control of bot chatting and movement (can't talk and walk:)
+ */
 @extern .float	b_chattime;
 /* b_entertime
  *	bot	used for keeping track of bot play time
@@ -62,12 +86,25 @@
  *	?	waypoint editing stuff
  */
 @extern .float	b_menu, b_menu_time, b_menu_value;
+/* route_failed
+ *	bot	if waypoint routing fails, go into roam mode
+ */
 @extern .float	route_failed;
-@extern .float	dyn_flags;
-@extern .float	dyn_time;
-@extern .float	dyn_plat;
+/* dyn_flags, dyn_time, dyn_plat
+ *	?	dynamic waypoint stuff
+ */
+@extern .float	dyn_flags, dyn_time, dyn_plat;
+/* temp_way
+ *	bot	roam mode stuff
+ */
 @extern .entity	temp_way;
+/* last_way
+ *	bot	previous waypoint ?
+ */
 @extern .entity	last_way;
+/* phys_obj
+ *	bot	actual physical entity of bot
+ */
 @extern .entity	phys_obj;
 /* targetN
  *	bot	LIFO stack of goals for the bot to achieve
@@ -78,14 +115,38 @@
  *	bot	linked list of possible foes
  */
 @extern .entity	_next, _last;
+/* current_way
+ *	wp	?
+ *	bot	currently saught waypoint?
+ */
 @extern .entity	current_way;
+/* b_angle
+ *	bot	desired view angle
+ */
 @extern .vector	b_angle;
-@extern .vector	b_dest;
+/* mouse_emu
+ *	bot	mouse movement emulation for mousing bots :)
+ */
 @extern .vector	mouse_emu;
+/* obs_dir
+ *	bot	obstruction direction?
+ */
 @extern .vector	obs_dir;
+/* movevect
+ *	bot	desired motion vector
+ */
 @extern .vector	movevect;
+/* b_dir
+ *	bot	direction to waypoint
+ */
 @extern .vector	b_dir;
+/* dyn_dest
+ *	?	dynamic waypoint stuff
+ */
 @extern .vector	dyn_dest;
+/* punchangle
+ *	bot	fake kick?
+ */
 @extern .vector	punchangle; // HACK - Don't want to screw with bot_phys
 
 // --------defines-----