Updated readme; fixed smaller bugs; removed comments