Development

Fixed a few small things in preparation to be used in another project.