Fixing a bit more bugs, we should not have any bugs except unimplemented features