diff --git a/rtv/main.py b/main.py
similarity index 89%
rename from rtv/main.py
rename to main.py
index bb9283e..b9bb3da 100644
--- a/rtv/main.py
+++ b/main.py
@@ -2,10 +2,10 @@ import argparse
 import praw
 from requests.exceptions import ConnectionError
 
-from errors import SubmissionURLError, SubredditNameError
-from utils import curses_session
-from subreddit import SubredditPage
-from submission import SubmissionPage
+from rtv.errors import SubmissionURLError, SubredditNameError
+from rtv.utils import curses_session
+from rtv.subreddit import SubredditPage
+from rtv.submission import SubmissionPage
 
 parser = argparse.ArgumentParser(description='Reddit Terminal Viewer')
 parser.add_argument('-s', dest='subreddit', default='front', help='subreddit name')
diff --git a/rtv/__init__.py b/rtv/__init__.py
index 0c87819..e69de29 100644
--- a/rtv/__init__.py
+++ b/rtv/__init__.py
@@ -1 +0,0 @@
-from main import main
\ No newline at end of file
diff --git a/rtv/content.py b/rtv/content.py
index 2ed9656..5833ee9 100644
--- a/rtv/content.py
+++ b/rtv/content.py
@@ -5,7 +5,7 @@ from contextlib import contextmanager
 import praw
 import six
 
-from errors import SubmissionURLError, SubredditNameError
+from .errors import SubmissionURLError, SubredditNameError
 
 def clean(unicode_string):
     """
@@ -69,7 +69,7 @@ class BaseContent(object):
 
         while True:
             try:
-                yield self.get(index, n_cols)
+                yield self.get(index, n_cols=n_cols)
             except IndexError:
                 break
             index += step
@@ -231,7 +231,7 @@ class SubmissionContent(BaseContent):
 
         return data
 
-    def toggle(self, index):
+    def toggle(self, index, n_cols=70):
         """
         Toggle the state of the object at the given index.
 
@@ -244,7 +244,7 @@ class SubmissionContent(BaseContent):
         if data['type'] == 'Comment':
             cache = [data]
             count = 1
-            for d in self.iterate(index+1, 1):
+            for d in self.iterate(index+1, 1, n_cols):
                 if d['level'] <= data['level']:
                     break
 
@@ -256,7 +256,7 @@ class SubmissionContent(BaseContent):
             comment['cache'] = cache
             comment['count'] = count
             comment['level'] = data['level']
-            comment['body'] = 'Hidden [{}]'.format(count)
+            comment['body'] = 'Hidden'.format(count)
             self._comment_data[index:index+len(cache)] = [comment]
 
         elif data['type'] == 'HiddenComment':
diff --git a/rtv/page.py b/rtv/page.py
index 51fae31..a9b81b2 100644
--- a/rtv/page.py
+++ b/rtv/page.py
@@ -1,6 +1,6 @@
 import curses
 
-from utils import Color
+from .utils import Color
 
 class Navigator(object):
     """
diff --git a/rtv/submission.py b/rtv/submission.py
index fc5b463..8019030 100644
--- a/rtv/submission.py
+++ b/rtv/submission.py
@@ -3,9 +3,9 @@ import sys
 
 import six
 
-from content import SubmissionContent
-from page import BasePage
-from utils import LoadScreen, Color
+from .content import SubmissionContent
+from .page import BasePage
+from .utils import LoadScreen, Color
 
 class SubmissionPage(BasePage):
 
diff --git a/rtv/subreddit.py b/rtv/subreddit.py
index f05424f..53e04ef 100644
--- a/rtv/subreddit.py
+++ b/rtv/subreddit.py
@@ -1,11 +1,11 @@
 import curses
 import sys
 
-from errors import SubredditNameError
-from page import BasePage
-from submission import SubmissionPage
-from content import SubredditContent
-from utils import LoadScreen, text_input, display_message, Color
+from .errors import SubredditNameError
+from .page import BasePage
+from .submission import SubmissionPage
+from .content import SubredditContent
+from .utils import LoadScreen, text_input, display_message, Color
 
 class SubredditPage(BasePage):
 
diff --git a/rtv/utils.py b/rtv/utils.py
index 030bef6..e8c3462 100644
--- a/rtv/utils.py
+++ b/rtv/utils.py
@@ -5,7 +5,7 @@ import threading
 from curses import textpad
 from contextlib import contextmanager
 
-from errors import EscapePressed
+from .errors import EscapePressed
 
 class Color(object):
 
diff --git a/setup.py b/setup.py
index 0cdb7f3..4b41e93 100644
--- a/setup.py
+++ b/setup.py
@@ -13,5 +13,5 @@ setup(
     keywords='reddit terminal praw',
     packages=['rtv'],
     install_requires=['praw', 'six'],
-    entry_points={'console_scripts': ['rtv=rtv:main']}
-)
\ No newline at end of file
+    entry_points={'console_scripts': ['rtv=main:main']}
+)