Development

Many issues fixed, could you take a look? @Jurrieb