Fixed #4 and some minor/medium issues