Bug fixes and tidying

Now works well with tabs, although some bugs still need ironing out.
Changed all size references to underscore as opposed to the initial odd
slash/underscore replacement.