fixed a few issues mentioned by remi