diff --git a/stdlib/sound.sun b/stdlib/sound.sun
index 6b0a0b3..c03c92b 100644
--- a/stdlib/sound.sun
+++ b/stdlib/sound.sun
@@ -5,7 +5,6 @@
  * 2015-2016 arookas
 \* ================================================= */
 
-// builtins
 builtin startBGM(num);
 builtin stopBGM(num);
 
diff --git a/stdlib/system.sun b/stdlib/system.sun
index 48c7f5a..7bb983e 100644
--- a/stdlib/system.sun
+++ b/stdlib/system.sun
@@ -5,10 +5,12 @@
  * 2015-2016 arookas
 \* ================================================= */
 
-// builtins
+// ================================================= \\
+// FLAGS
+// ================================================= \\
+
 builtin getSystemFlag(flag);
 builtin setSystemFlag(flag, value);
 
-// functions
 function setOnSystemFlag(flag) { setSystemFlag(flag, true); }
 function setOffSystemFlag(flag) { setSystemFlag(flag, false); }
diff --git a/stdlib/talk.sun b/stdlib/talk.sun
index e08474a..d67d174 100644
--- a/stdlib/talk.sun
+++ b/stdlib/talk.sun
@@ -16,9 +16,11 @@ const TALKF_CLOSE	= (1 << 0);
 // builtins
 builtin getTalkMode();
 builtin isTalkModeNow();
+
+builtin setTalkMsgID(msgID, flags);
+
 builtin getTalkNPC();
 builtin getTalkNPCName();
-builtin setTalkMsgID(msgID, flags);
 
 // functions
 function waitTalkStart(name) {
@@ -85,8 +87,8 @@ function select(msgID, flags) {
 	return getTalkSelectedValue();
 }
 
-function talkAndSelect(msgID)			{ select(msgID, TALKF_WAIT); }
-function talkAndSelectClose(msgID)		{ select(msgID, TALKF_CLOSE); }
+function talkAndSelect(msgID)				{ return select(msgID, TALKF_WAIT); }
+function talkAndSelectClose(msgID)	{ return select(msgID, TALKF_CLOSE); }
 
 // ================================================= \\
 // FORCE