Development

Fixed threading and added some other lesser features