cleaned up code a bit, need to put camp stuff in own file