Implemented quotes, Other minor fixes