diff --git a/src/dialogs.py b/src/dialogs.py
index e74697fae..990b80e5a 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -492,7 +492,7 @@ class ConfirmationDialogCheck(ConfirmationDialog):
 		# add ok button manually, because we need to focus on it 
 		ok_button = self.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK)
 		self.checkbutton = gtk.CheckButton(checktext)
-		self.vbox.pack_start(self.checkbutton, expand=False, fill=True)
+		self.vbox.pack_start(self.checkbutton, expand = False, fill = True)
 		ok_button.grab_focus()
 	
 	def is_checked(self):
diff --git a/src/filetransfers_window.py b/src/filetransfers_window.py
index db6a561e5..fead44e3f 100644
--- a/src/filetransfers_window.py
+++ b/src/filetransfers_window.py
@@ -300,6 +300,7 @@ _('Connection with peer cannot be established.'))
 				if response == gtk.RESPONSE_OK:
 					file_path = dialog.get_filename()
 					if os.path.exists(file_path):
+						#FIXME: pango does not work here.
 						primtext = _('This file already exists')
 						sectext = _('Would you like to overwrite it?')
 						dialog2 = dialogs.ConfirmationDialog(primtext, sectext)
diff --git a/src/tooltips.py b/src/tooltips.py
index eaf2e7a38..8aa5d3a60 100644
--- a/src/tooltips.py
+++ b/src/tooltips.py
@@ -386,28 +386,28 @@ class FileTransfersTooltip(BaseTooltip):
 		text += '\n<b>' + _('Status: ') + '</b>' 
 		status = '' 
 		if not file_props.has_key('started') or not file_props['started']:
-			status =  _('not started')
+			status =  _('Not started')
 		elif file_props.has_key('connected'):
 			if file_props.has_key('stopped') and \
 				file_props['stopped'] == True:
-				status = _('stopped')
+				status = _('Stopped')
 			elif file_props['completed']:
-					status = _('completed')
+					status = _('Completed')
 			elif file_props['connected'] == False:
 				if file_props['completed']:
-					status = _('completed') # FIXME: all those make them Completed
+					status = _('Completed')
 			else:
 				if file_props.has_key('paused') and  \
 					file_props['paused'] == True:
-					status = _('paused')
+					status = _('Paused')
 				elif file_props.has_key('stalled') and \
 					file_props['stalled'] == True:
 					#stalled is not paused. it is like 'frozen' it stopped alone
-					status = _('stalled') # FIXME: all those make them Stalled
+					status = _('Stalled')
 				else:
-					status = _('transferring')
+					status = _('Transferring')
 		else:
-			status =  _('not started')
+			status =  _('Not started')
 		
 		text += status
 		self.text_lable.set_markup(text)